Auto merge of #1604 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 13 May 2015 04:24:28 +0000 (04:24 +0000)
committerbors <bors@rust-lang.org>
Wed, 13 May 2015 04:24:28 +0000 (04:24 +0000)
There was a lifetime parameter regression in git2-rs which prevented Cargo from
building on nightly


Trivial merge